Autogenerated HTML docs for v1.5.3.4-319-gdd817
diff --git a/git-config.html b/git-config.html index 770de75..f9d4240 100644 --- a/git-config.html +++ b/git-config.html
@@ -889,7 +889,7 @@ Set the path to the working tree. The value will not be used in combination with repositories found automatically in a .git directory (i.e. $GIT_DIR is not set). - This can be overriden by the GIT_WORK_TREE environment + This can be overridden by the GIT_WORK_TREE environment variable and the <em>--work-tree</em> command line option. </p> </dd> @@ -1609,7 +1609,7 @@ message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. - Can be overriden by <em>GIT_MERGE_VERBOSITY</em> environment variable. + Can be overridden by <em>GIT_MERGE_VERBOSITY</em> environment variable. </p> </dd> <dt> @@ -1941,7 +1941,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 03-Oct-2007 12:03:44 UTC +Last updated 23-Oct-2007 01:21:46 UTC </div> </div> </body>
